From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 30 Mar 2020 03:38:34 +0000 (-0400)
Subject: window: Remove initial-focus leftovers
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~19^2~10^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=de31bb59a19655e87c931e2104afeab72737c439;p=gtk4.git

window: Remove initial-focus leftovers

We removed the way to set initial_focus a year ago,
time to get rid of the leftovers.
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b6f90ca794..7f1ec9e020 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -175,7 +175,6 @@ typedef struct
 {
   GtkWidget             *attach_widget;
   GtkWidget             *default_widget;
-  GtkWidget             *initial_focus;
   GtkWidget             *focus_widget;
   GtkWindow             *transient_parent;
   GtkWindowGeometryInfo *geometry_info;
@@ -2343,10 +2342,7 @@ gtk_window_get_focus (GtkWindow *window)
 
   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
 
-  if (priv->initial_focus)
-    return priv->initial_focus;
-  else
-    return priv->focus_widget;
+  return priv->focus_widget;
 }
 
 static void
@@ -4156,12 +4152,7 @@ gtk_window_show (GtkWidget *widget)
   gtk_widget_map (widget);
 
   if (!priv->focus_widget)
-    {
-      if (priv->initial_focus)
-        gtk_window_set_focus (window, priv->initial_focus);
-      else
-        gtk_window_move_focus (widget, GTK_DIR_TAB_FORWARD);
-    }
+    gtk_window_move_focus (widget, GTK_DIR_TAB_FORWARD);
   
   if (priv->modal)
     gtk_grab_add (widget);